revert earlier change to insert_path so that we test that the directory

Thu Mar 11 16:18:51 2004  Jonathan Blandford  <jrb@redhat.com>

        * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
        earlier change to insert_path so that we test that the directory
        exists.

        * gtk/gtkfilechooserdialog.c
        (gtk_file_chooser_dialog_constructor): move focus.

diff --git a/ChangeLog b/ChangeLog
index 804757fbc01266604b36469a65595b584d3ec738..8063147a51b787a9b5880c25bd46baa77537e200 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Mar 11 16:18:51 2004  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
+       earlier change to insert_path so that we test that the directory
+       exists.
+
+       * gtk/gtkfilechooserdialog.c
+       (gtk_file_chooser_dialog_constructor): move focus.
+
 Thu Mar 11 22:12:14 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_size_request): Use the same

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 804757fbc01266604b36469a65595b584d3ec738..8063147a51b787a9b5880c25bd46baa77537e200 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Thu Mar 11 16:18:51 2004  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
+       earlier change to insert_path so that we test that the directory
+       exists.
+
+       * gtk/gtkfilechooserdialog.c
+       (gtk_file_chooser_dialog_constructor): move focus.
+
 Thu Mar 11 22:12:14 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_size_request): Use the same

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 804757fbc01266604b36469a65595b584d3ec738..8063147a51b787a9b5880c25bd46baa77537e200 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Thu Mar 11 16:18:51 2004  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
+       earlier change to insert_path so that we test that the directory
+       exists.
+
+       * gtk/gtkfilechooserdialog.c
+       (gtk_file_chooser_dialog_constructor): move focus.
+
 Thu Mar 11 22:12:14 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_size_request): Use the same

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 804757fbc01266604b36469a65595b584d3ec738..8063147a51b787a9b5880c25bd46baa77537e200 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Thu Mar 11 16:18:51 2004  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
+       earlier change to insert_path so that we test that the directory
+       exists.
+
+       * gtk/gtkfilechooserdialog.c
+       (gtk_file_chooser_dialog_constructor): move focus.
+
 Thu Mar 11 22:12:14 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_size_request): Use the same

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 804757fbc01266604b36469a65595b584d3ec738..8063147a51b787a9b5880c25bd46baa77537e200 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Thu Mar 11 16:18:51 2004  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): revert
+       earlier change to insert_path so that we test that the directory
+       exists.
+
+       * gtk/gtkfilechooserdialog.c
+       (gtk_file_chooser_dialog_constructor): move focus.
+
 Thu Mar 11 22:12:14 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkspinbutton.c (gtk_spin_button_size_request): Use the same

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index bde958ff5d8606dd5f97234bd028615147cadd8c..b89a12aa32cdf3e1e297b66cd413338b22246097 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -878,6 +878,8 @@ get_file_info (GtkFileSystem *file_system, const GtkFilePath *path, gboolean nam
   GtkFileFolder *parent_folder;
   GtkFileInfo *info;
 
+  info = NULL;
+
   if (!gtk_file_system_get_parent (file_system, path, &parent_path, error))
     return NULL;
 
@@ -890,17 +892,11 @@ get_file_info (GtkFileSystem *file_system, const GtkFilePath *path, gboolean nam
                                              error);
   gtk_file_path_free (parent_path);
 
-  if (parent_folder)
-    {
-      info = gtk_file_folder_get_info (parent_folder, path, error);
-      g_object_unref (parent_folder);
-    }
-  else
-    {
-      info = NULL;
-      /* Name-only should not fail.  */
-      g_return_val_if_fail (!name_only, NULL);
-    }
+  if (!parent_folder)
+    return NULL;
+
+  info = gtk_file_folder_get_info (parent_folder, path, error);
+  g_object_unref (parent_folder);
 
   return info;
 }
@@ -923,10 +919,6 @@ shortcuts_insert_path (GtkFileChooserDefault *impl,
   gpointer data;
   GtkTreeIter iter;
 
-  /* Note: currently this function cannot fail.  If you ever change
-   * it so it can, go check callers and their callers.
-   */
-
   if (is_volume)
     {
       data = volume;
@@ -936,14 +928,18 @@ shortcuts_insert_path (GtkFileChooserDefault *impl,
     }
   else
     {
+      /* Always check to make sure that the directory exists. */
+      GtkFileInfo *info = get_file_info (impl->file_system, path, FALSE, error);
+
+      if (info == NULL)
+       return FALSE;
+
       if (label)
        label_copy = g_strdup (label);
       else
-       {
-         GtkFileInfo *info = get_file_info (impl->file_system, path, TRUE, error);
-         label_copy = g_strdup (gtk_file_info_get_display_name (info));
-         gtk_file_info_free (info);
-       }
+       label_copy = g_strdup (gtk_file_info_get_display_name (info));
+
+      gtk_file_info_free (info);
 
       data = gtk_file_path_copy (path);
       pixbuf = gtk_file_system_render_icon (impl->file_system, path, GTK_WIDGET (impl),
@@ -3940,15 +3936,8 @@ gtk_file_chooser_default_add_shortcut_folder (GtkFileChooser    *chooser,
 {
   GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
   gboolean result;
-  GtkFileInfo *info;
   int pos;
 
-  /* Test validity of path here.  */
-  info = get_file_info (impl->file_system, path, FALSE, error);
-  if (!info)
-    return FALSE;
-  gtk_file_info_free (info);
-
   pos = shortcuts_get_pos_for_shortcut_folder (impl, impl->num_shortcuts);
 
   result = shortcuts_insert_path (impl, pos, FALSE, NULL, path, NULL, FALSE, error);

diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index 14f4b8b90b50c21428cb72bb7b355743b6314c70..6de17f1a7a6273606460df088168ff11ad97cac4 100644 (file)
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -331,19 +331,20 @@ gtk_file_chooser_dialog_constructor (GType                  type,
   else
     priv->widget = g_object_new (GTK_TYPE_FILE_CHOOSER_WIDGET, NULL);
 
-  _gtk_file_chooser_embed_initial_focus (GTK_FILE_CHOOSER_EMBED (priv->widget));
-
   g_signal_connect (priv->widget, "file-activated",
                    G_CALLBACK (file_chooser_widget_file_activated), object);
   g_signal_connect (priv->widget, "default-size-changed",
                    G_CALLBACK (file_chooser_widget_default_size_changed), object);
 
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (object)->vbox), priv->widget, TRUE, TRUE, 0);
+
   gtk_widget_show (priv->widget);
 
   _gtk_file_chooser_set_delegate (GTK_FILE_CHOOSER (object),
                                  GTK_FILE_CHOOSER (priv->widget));
 
+  _gtk_file_chooser_embed_initial_focus (GTK_FILE_CHOOSER_EMBED (priv->widget));
+
   gtk_widget_pop_composite_child ();
 
   return object;